Skip to content

pack: output: added documentation for epoch_ms timestamp #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Oct 22, 2025
Merged

pack: output: added documentation for epoch_ms timestamp #715

merged 4 commits into from
Oct 22, 2025

Conversation

@marcosdiez
Copy link
Contributor

@marcosdiez marcosdiez commented Feb 17, 2022 •
edited
Loading

Documentation for fluent/fluent-bit#4131

Contains also changes from #708

@marcosdiez marcosdiez mentioned this pull request Feb 17, 2022
Closed
3 tasks
@PettitWesley
Copy link
Contributor

PettitWesley commented Feb 17, 2022

@marcosdiez You need to rebase though we also won't merge docs until the change is released so by then you may need to rebase again...

@marcosdiez
Copy link
Contributor Author

marcosdiez commented Feb 18, 2022

Done!

@lecaros
Copy link
Contributor

lecaros commented Mar 9, 2022

hi @marcosdiez, thanks for your contribution.
Please resolve the conflict so we can merge it.

@lecaros lecaros added conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes labels Mar 9, 2022
@marcosdiez
Copy link
Contributor Author

marcosdiez commented Mar 10, 2022

@lecaros conflicts solved!

@lecaros
Copy link
Contributor

lecaros commented Mar 10, 2022

Hi @marcosdiez it seems we have new conflicts. Please take a look.

@marcosdiez
Copy link
Contributor Author

marcosdiez commented Mar 10, 2022

Hi @lecaros
I merged and it's all good now. That being said, fluent/fluent-bit#4131 has not yet been merged (although I think it should). Please merge them together.

@lecaros lecaros added waiting-on-code-merge and removed waiting-for-user Waiting for user/contributors feedback or requested changes conflict Waiting on conflict to be resolved by contributor labels Mar 10, 2022
@lecaros lecaros added the conflict Waiting on conflict to be resolved by contributor label Aug 19, 2022
@lecaros
Copy link
Contributor

lecaros commented Feb 22, 2024

Hi @marcosdiez I see that the related PR was closed. However, there are some others mentioned there. Can you please confirm if this PR is still relevant?

@lecaros lecaros added the waiting-for-user Waiting for user/contributors feedback or requested changes label Feb 22, 2024
@marcosdiez
Copy link
Contributor Author

marcosdiez commented Feb 22, 2024

@lecaros yes, this is relevant.

As one can see, https://github.com/fluent/fluent-bit/blob/master/src/flb_pack.c#L871 epoch_ms is in the code but not documented, which unfortunately makes it a secret.

I would merge it sooner than later.

@lecaros lecaros requested review from a team as code owners March 25, 2025 14:34
@eschabell
Copy link
Collaborator

eschabell commented Oct 21, 2025

The code PR has been merged here: fluent/fluent-bit#6114

@eschabell eschabell self-assigned this Oct 21, 2025
@eschabell
Copy link
Collaborator

eschabell commented Oct 21, 2025

@marcosdiez can you resolve the conflicts here so I can merge these updates?

@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

The conflicts were mostly due to stylistic updates. I added the change to the table, and then fixed the conflicts so this can keep moving.

@patrick-stephens
Copy link
Contributor

patrick-stephens commented Oct 21, 2025

@esmerel it's still failing CI

@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

The vale failure is due to the same issues other PRs are having. Not sure why markdownlint is grumpy, I'll look.

esmerel
esmerel reviewed Oct 21, 2025
View reviewed changes
@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

The vale failure is due to the same issues other PRs are having. Not sure why markdownlint is grumpy, I'll look.

hah, found it and fixed.

@eschabell
Copy link
Collaborator

eschabell commented Oct 22, 2025

@marcosdiez merging this docs PR as the original code PR fluent/fluent-bit#4131 was closed in favor of the final merged code PR fluent/fluent-bit#6114. Thanks for the patience here.

@eschabell eschabell removed waiting-for-user Waiting for user/contributors feedback or requested changes conflict Waiting on conflict to be resolved by contributor labels Oct 22, 2025
@eschabell eschabell merged commit ff4ef2b into fluent:master Oct 22, 2025
7 checks passed
TomlinfreeGit pushed a commit to TomlinfreeGit/fluent-bit-docs that referenced this pull request Oct 28, 2025
@marcosdiez @esmerel
pack: output: added documentation for epoch_ms timestamp (fluent#715)
f7dc001 
* pack: output: added java_sql_timestamp, a format string used by amazon athena

Signed-off-by: Marcos Diez <[email protected]>

* pack: output: added docs for java_sql_timestamp and epoch_ms

Signed-off-by: Marcos Diez <[email protected]>

* Update pipeline/outputs/standard-output.md

Signed-off-by: Lynette  Miles <[email protected]>

---------

Signed-off-by: Marcos Diez <[email protected]>
Signed-off-by: Lynette  Miles <[email protected]>
Co-authored-by: Lynette  Miles <[email protected]>
Signed-off-by: Tom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@esmerel esmerel esmerel left review comments

@PettitWesley PettitWesley PettitWesley approved these changes

Assignees

@eschabell eschabell

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@marcosdiez @PettitWesley @lecaros @eschabell @esmerel @patrick-stephens